From 2a06b0ae5984c368c5cc8eeed81828220d2f53bb Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 1 Oct 2014 19:37:10 +0000
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 configure.ac                | Bin 464646 -> 465382 bytes
 odk/CustomTarget_check.mk   |   2 +-
 odk/Module_odk.mk           |   6 ++++--
 odk/util/check.pl           |   2 +-
 scp2/InstallModule_sdkoo.mk |   6 ++++++
 scp2/source/sdkoo/sdkoo.scp |   2 ++
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2d3544e78551bb58822cb80f809efae334d0d82e..b9fd794cc1d7cd6c8031ee265d5b85264aba2aa5 100644
GIT binary patch
delta 546
zcmY*WL1+^}6lL-^+s*Dq!JyHw*2z+>LPIU)A{uB>Du$K@TD(}P+h#&nOA_5g@gNkz
z=3EQDqX}MWh3p2!LJuCi3%wLC9`xct(CWz^I|)gp1CJTrd;iUcx6-tJyt9_yGsnb7
zovGSA=aG{yE!<iA?j66Z^X|EwN<DTfi>aPE^k11Siv_pf3XfM71@9V=Fxa4ym04Id
z*eT2zOz-PyWrJA<TJ?Z_ps*OY$<Fnd+N8-OLYtE&Z8zdP<#2mI6rK4cF;~jpw|O$d
zizSTAhEL<^I$gkwPsh;rmPN5O9@6pc7Yp~Yko**~@T^IfKyS#x=O&%R&t=6#d6jhh
zYm&8gS5*-6=?oHQrFZy?<a0hHVASPee`<<`(cdhL=RU<TT2~_oUdgXEd>VoFnvys&
z&IUUnyDLn?)eVYbAfSuL{Ur@EfpjDqYW(FxQm`J#O<x3b0`-7~u(L-TUjxcuBA}z@
z&FLH2>r>Y<_7mZu5e@aHBkdllMNd?CcI?)e6!l2K?UW!dvE+%)`;Y_a7M&mN+Pjf9
f&+vAteWl%2QI8y&&<k!Y*CGi;BD|SvsUO5X7=^8{

delta 221
zcmWm3ze@sP0LF3d9^Y3jJ4GVQJCslerxItw%_f~49a<u2aW)6hsVVSTTH4|cj{7AJ
z3H=))7_=OO1kEAT>+tz5-#D};t~H9ZerBp0nxZds1Irh7A{=t)BE>%l!R}THmTc5$
zdMNYGLxZn23VicaK5XRq<-uawSNHc5$IPyAz>be1o$rLf*11e`?8AI&RSeF3)Oo#=
zIl67F%AZ>;#f^g_wgX)9A;1}TM3(OXs@(1q-y_G15KRt3oHDsmHx6O)sv(lIXL&O1
OMNkroSo9+Kc=Hd;aZ$$r

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index a9b542d082d..707829a13df 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_lib) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 50da7d2c7fb..6976da57e59 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,11 +43,13 @@ ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
 	GeneratedPackage_uno_loader_classes \
 	$(if $(filter WNT,$(OS)),Library_unowinreg) \
 	Package_unowinreg \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 ))
 endif
 
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 899b42cca0e..2c7a7805c1e 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -188,7 +188,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
diff --git a/scp2/InstallModule_sdkoo.mk b/scp2/InstallModule_sdkoo.mk
index 0669195323f..09a89f5c323 100644
--- a/scp2/InstallModule_sdkoo.mk
+++ b/scp2/InstallModule_sdkoo.mk
@@ -17,6 +17,12 @@ $(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
 ))
 endif
 
+ifneq ($(JAVADOC),)
+$(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
+	-DJAVADOC \
+))
+endif
+
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\
     scp2/source/sdkoo/sdkoo \
 ))
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index f73e3e8ef59..abfeb880320 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -126,6 +126,7 @@ File gid_File_Package_odk_html
 End
 
 #if defined(ENABLE_JAVA)
+#if defined(JAVADOC)
 File gid_File_Package_odk_javadoc
     TXT_FILE_BODY;
     Dir = FILELIST_SDK_DIR;
@@ -133,6 +134,7 @@ File gid_File_Package_odk_javadoc
     Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 #endif
+#endif
 
 File gid_File_Package_odk_lib
     TXT_FILE_BODY;
-- 
2.30.2